commit | 2ab0a57211bbfe62f8730550b8456e17ce59d5cf | [log] [tgz] |
---|---|---|
author | Tao Bao <tbao@google.com> | Wed May 06 16:39:26 2015 -0700 |
committer | Tao Bao <tbao@google.com> | Wed May 06 16:39:26 2015 -0700 |
tree | 3136b393812950303b9a67a4c9743cc9ec1683c6 | |
parent | a6fb541857d822939cada24574f566df87dda35d [diff] | |
parent | 550bd340c36d33c1bc820a83f92e588421102e2b [diff] |
resolved conflicts for merge of 550bd340 to mnc-dev-plus-aosp Change-Id: Ia447435f1345a0bf9648d1d5593e276191d6a99c