OSDN Git Service

Reconcile with jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 6 Aug 2012 20:34:18 +0000 (13:34 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Mon, 6 Aug 2012 20:34:18 +0000 (13:34 -0700)
commit45193df53aebb0764853aa21541e6f6ab73b9b9f
tree0361a2c92a97db1c0bc0df5b630c8bb606ab153e
parent1466b1aad294138fc1e189c6fdce5eb7a2d06a42
parentf4497e15b78383b06d59ce244255fc7625beaec5
Reconcile with jb-mr1-release - do not merge

Change-Id: If9b215d19d88c3f1793013adc8cb81c8c890faa0