OSDN Git Service

Reconcile with jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 2 Oct 2012 16:20:26 +0000 (09:20 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Tue, 2 Oct 2012 16:20:26 +0000 (09:20 -0700)
commit81a3dfd4e33c318769f29cf3eb7e00a42c2d1ecc
treedd30ab80172c681bb7cbea5173f451d1d9cf96fc
parente4fd2b453384a9dd61cf18ef730c0bde01e4bcf0
parentb1e4cd3abbe383053137aedcd657ed94fb0be375
Reconcile with jb-mr1-release - do not merge

Change-Id: I31f2c7e4ec4673e7b360ba4abc94b4138cb135d8