OSDN Git Service

Reconcile with jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 1 Aug 2012 22:13:27 +0000 (15:13 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 1 Aug 2012 22:13:27 +0000 (15:13 -0700)
commiteaa83bbd9ff40ff428ef0c6f5eea1f0ddf8a7ff4
tree5fb0ed74b6c5ce6dd51d546ef49ffc184e9a0467
parent2ff5d8765ce1de04b8be8cdd4772ef42563e41ad
parent551f180d515e3814149726683f80453dcf6a6f89
Reconcile with jb-mr1-release - do not merge

Change-Id: I80d33df61bb9c1f1293c71d1d01a1e510e2ce693