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:37 +0000 (09:48 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Fri, 29 Mar 2013 16:48:37 +0000 (09:48 -0700)
commita5bf9b6d355a6a82fc9f00959c744cf32c936953
treeb7df88f4785e9b5076cf7ebb2c7a0aed28a53d91
parentfd21b120062976f20450ac3cf80f980b54c59e00
parentf3e2ba7733ee94f3ddc09f18d4f51a87e2e01fc2
Reconcile with jb-mr2-release - do not merge

Change-Id: I8e1546cee7e24bc1407c8b022d29d463a661839a