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:03:48 +0000 (11:03 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Tue, 7 Aug 2012 18:03:48 +0000 (11:03 -0700)
commit9a7768a4f3fede135ab73098d6a2ae046b5d016b
tree638d97d8374ad43338d8ccf7b41c9a3e50bffe98
parenta9311c17f6844f74b08c2e3b73a76c4ba9902b7a
parentd02212da42cb4519cac56547213f72464bb2f44b
Reconcile with jb-mr1-release - do not merge

Change-Id: I699a2310b14b3168c32dca19e4c9055eeab79d1a