OSDN Git Service

Reconcile with jb-mr2-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 16 May 2013 12:43:41 +0000 (05:43 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 16 May 2013 12:43:41 +0000 (05:43 -0700)
commit92cf355308ffb28f8a460d69915ca5955016a632
tree4ce6ce01cc51483136b8edb6c93f1479d28f0062
parent28fc78bf5fbb6288a27f3f25565a960a1873b0ef
parent60b16060612c47386946ee1674bc2149c327bb56
Reconcile with jb-mr2-release - do not merge

Change-Id: Ic457c583534afce9b1697b3b34221a729e2bc5b2