OSDN Git Service

Reconcile with jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 7 Aug 2012 18:02:30 +0000 (11:02 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Tue, 7 Aug 2012 18:02:30 +0000 (11:02 -0700)
commitd9c2de10d94b1c46e0e3dee41bd6d8de673d2267
tree0361a2c92a97db1c0bc0df5b630c8bb606ab153e
parent45193df53aebb0764853aa21541e6f6ab73b9b9f
parenteeb321c54ecd6adf50e2de761015b8d5dae484e7
Reconcile with jb-mr1-release - do not merge

Change-Id: I753a2c0b3bfb42c526b954e58d8874daf31420ed