OSDN Git Service

Reconcile with jb-mr2-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 16 May 2013 12:42:55 +0000 (05:42 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 16 May 2013 12:42:55 +0000 (05:42 -0700)
commitc0e9713ace444e7627f44bbe3feb7c5ae479e834
tree7f3028088c1c50313d642c8d96124a4a7a0d5d92
parent809b537e4a9fa7007bb455a630f999514f0f0cee
parentf91381bd25593e20efe8710da9917a63a702f346
Reconcile with jb-mr2-release - do not merge

Change-Id: Id8977deab29bcfaf875ff4431c398e245f61dfc5