OSDN Git Service

Reconcile with jb-mr2-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 17 May 2013 19:54:44 +0000 (12:54 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Fri, 17 May 2013 19:54:44 +0000 (12:54 -0700)
commitaecc1998647fc33822a8e5c55673c8f45ec466e7
treec19730d561c34fce1de15c9e942e696715a3b486
parent72b6bd030c21553f32073790ac8276111ac4e684
parent6fd74cd6b714a252ab806cacc32acf1b045324ea
Reconcile with jb-mr2-release - do not merge

Change-Id: I6c8f974fdf7022bfe1cc0ca00a3cf1466d641428