OSDN Git Service

Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 6 Nov 2012 20:16:51 +0000 (12:16 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Tue, 6 Nov 2012 20:16:51 +0000 (12:16 -0800)
commit930540de4415795500e22f02bb707768b7742fc6
tree5862b78d667371e87353d024d877a07edf11fa94
parent86c93df1d626c42147db2f2a6dfb5dcad83477ec
parent6de35d839f3d5098c6b81ccc919b1f8737644b45
parent279731e733c27fd8dfb24d740c05f9ba1b4f8db0
Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

Change-Id: Ibb893211cd723e60db60b80a3da19c58575461e2