OSDN Git Service

Reconcile with jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Sat, 25 Aug 2012 14:17:23 +0000 (07:17 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Sat, 25 Aug 2012 14:17:23 +0000 (07:17 -0700)
commitaecda4950b9ef92285bb1755183c2b10e6c2c2c5
treed123afdff52488c63904327559250abb0692bef6
parent8bd1a3234ac81bc3d26de72647ad611615273f62
parent36bbd58cff5fd688f65a70d794701d332739bf3c
Reconcile with jb-mr1-release - do not merge

Change-Id: If68758d7bb648f89c4a663ca6bcc419f380518e8