OSDN Git Service

Reconcile with jb-mr2-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 3 Jun 2013 21:03:32 +0000 (14:03 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Mon, 3 Jun 2013 21:03:32 +0000 (14:03 -0700)
commitf8e45028eb7f69f74292f4b739c01b58b90f2abd
treeba02c8667186c7f362b09cc72f3621b13feca49d
parentc44da2a89e2461881baafb73549f37cbc6c68b0c
parent4c32ba1965fd295bc15f831d44e10aea2daa39f4
Reconcile with jb-mr2-release - do not merge

Change-Id: If28ee81947b5975843ee6843824e5f7069333251