OSDN Git Service

Reconcile with jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 1 Nov 2012 14:51:53 +0000 (07:51 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 1 Nov 2012 14:51:53 +0000 (07:51 -0700)
commit19409cd098ff01560443298f40652953222da067
tree5862b78d667371e87353d024d877a07edf11fa94
parent5d7d6ace05e310115d13fe31d68a218c7f20c18c
parent279731e733c27fd8dfb24d740c05f9ba1b4f8db0
Reconcile with jb-mr1-release - do not merge

Change-Id: Id8e9b62ec7d117c1b6bdbeb739be7148f15f31cb