OSDN Git Service

Reconcile with jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 24 Sep 2012 17:14:03 +0000 (10:14 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Mon, 24 Sep 2012 17:14:03 +0000 (10:14 -0700)
commita3103f9fe060e91fd6de0975ebe31ddeed88a9e4
tree9efe68751c858de127b9fe242f4282cd183ec70a
parentbdb84a1eb0bbb75648c4761c797fd179a5e1e893
parentd553ad32eb1d4fa3c02c0ca1aebb5e09fe0c2760
Reconcile with jb-mr1-release - do not merge

Change-Id: I73a0aeb8cfaf12e12eee1b5d6f9549ef24895f62