OSDN Git Service

Reconcile with jb-mr0-release
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 19 Jul 2012 15:41:05 +0000 (08:41 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 19 Jul 2012 15:41:05 +0000 (08:41 -0700)
commitde5318ceca4693c3ec3002cf9470d84200c6a0ee
tree2d6ab7a2049a49cc90494c732cd46d2332c27cd8
parent2936da9b396a5c2286f61e20fe9f4a21bbc4534d
parenta32433403e84be341f417e52c15c6f6ed1002519
Reconcile with jb-mr0-release

Change-Id: Icf6d8b9461cfd22e019d735a8ba66812879e3083