OSDN Git Service

Reconcile with jb-mr2-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 10 Jul 2013 00:13:13 +0000 (17:13 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 10 Jul 2013 00:13:14 +0000 (17:13 -0700)
commitf51538f444ca9448d194cf184af4fd8f0554d723
tree0170831ebee5c0b5fba1f6ddfce0d0cd8f1d5a13
parentdff4ec87e7b942b7b4410f639fc74c2cffb386d6
parent2e55547acca4d5399cd1ff843ae6ec99c79d6782
Reconcile with jb-mr2-release - do not merge

Change-Id: Id09bc212bd1e6901188ca5019663d19c6d9f049a