OSDN Git Service

Reconcile with jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 7 Nov 2012 18:20:11 +0000 (10:20 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 7 Nov 2012 18:20:11 +0000 (10:20 -0800)
commit5636617ce28f4ce2e5bb8a5bce35dbd57b79b14a
tree30124d90bd075254db88b30e72e53d09512eca0e
parenta6bb17113d7e0cc8e3299b6838afe40f88aff41d
parent39758e2cf8ef3c948a57f5afff3aa26ca11eeed6
Reconcile with jb-mr1-release - do not merge

Change-Id: Id3f4eff2714ec8ba5146b23954cf3cf3e811564b