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:22 +0000 (05:43 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 16 May 2013 12:43:22 +0000 (05:43 -0700)
commitd49bbba51d8d6a3aaed65715b87d251e3d181728
tree215a75d9812f46a92c6ac1e85bc09269562f10ef
parent2fca6e548ff48988e63d3550d807b016192e0a77
parent83fcfacc3eb488dac8f08d2e0ea3389e37ee98ca
Reconcile with jb-mr2-release - do not merge

Change-Id: If30a4d2103f4851f0faa1a8cf5ccf685b18e0664