OSDN Git Service

Reconcile with jb-mr1.1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 10 Dec 2012 23:19:43 +0000 (15:19 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Mon, 10 Dec 2012 23:19:43 +0000 (15:19 -0800)
commit064d252918c23cc4c90f8bc62f9ae47ba7afa4d5
tree08237c5cdc51537ab4b99c92395e78ad97142a78
parent50f8d2856b6644059b31684687842bf9c1f2e814
parent4f9fb2ba977c6ed119211fd43ff1ece9ba163fc3
Reconcile with jb-mr1.1-release - do not merge

Change-Id: I97991f966ea0d3a6f3bad87c82d9926d55e6d63c