OSDN Git Service

Reconcile with jb-mr2-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 26 Mar 2013 17:49:03 +0000 (10:49 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Tue, 26 Mar 2013 17:49:03 +0000 (10:49 -0700)
commit565b5d1b973b587d57222eb0f9a6f2b07623bca3
tree6c6d407aabcdea23347b63fe2046c1b7bac52ae8
parentdf122f1fe63c57adbfe9df1b3918d08cb9363736
parent1e71487b2d5ef2a2bca8dd3d8240ab90eb664699
Reconcile with jb-mr2-release - do not merge

Change-Id: Icbbd50582351b94fc2d424995331daac6edf5855