OSDN Git Service

Reconcile with jb-mr2-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 29 Mar 2013 16:48:35 +0000 (09:48 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Fri, 29 Mar 2013 16:48:35 +0000 (09:48 -0700)
commitd28e10d6c183a1e6e2f7be1001188d635c730f87
treeb7dff85bd6abcba49e5e45f5bbb538e46c8597e5
parentaa0d1a173787bdc766a0fa48052c0cf796f91602
parentbb999c493b3b2b23b9820363a2e39e0a852ac24b
Reconcile with jb-mr2-release - do not merge

Change-Id: I88a69e508f1bd76db6289d1956f0861701a30391