OSDN Git Service

Reconcile with jb-mr2-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 12 Jun 2013 14:23:39 +0000 (07:23 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 12 Jun 2013 14:23:39 +0000 (07:23 -0700)
commitca70fd763174361aa9ed25241f94d52f94ef6387
tree02e9638f3c1208c683c88fabf475bc83ce5518fa
parent7dc55aab7b1e53f784ffc75d1e7e28c0ee42bb0c
parentcc746985de8552c0d3e1f8e327e21c3e73008d00
Reconcile with jb-mr2-release - do not merge

Change-Id: Ie1d9fd280ad0b593e75ce17c11e45d34cf6df4ab