OSDN Git Service

Reconcile with jb-mr2-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 26 Mar 2013 17:49:32 +0000 (10:49 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Tue, 26 Mar 2013 17:49:32 +0000 (10:49 -0700)
commit6a77fb589cedf0d678ef3baa024fb6600c956c4b
tree227730d9a21864ffa01a881837ed966cbb9d4c04
parent2c5a58ee659b386fad8aafa37d604a44709653ab
parent77e908100f00c6d28db0d8f73885b71fb8a01a68
Reconcile with jb-mr2-release - do not merge

Change-Id: I5556f655c440622963e3d1f89e6c8ac2bf45d53f