OSDN Git Service

Reconcile with jb-mr2-zeroday-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 8 Jul 2013 22:33:11 +0000 (15:33 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Mon, 8 Jul 2013 22:33:11 +0000 (15:33 -0700)
commit291967728b02ad9a7d5545b0eb1ec0c4c3d664af
tree1f4bebe3e7480d719ed2431427db16475730558e
parent1468dd9cefe11d5938a5497688f99701b6b14706
parent15e5c9f49ad92ce985c9d0c2fe2767df2833b12c
Reconcile with jb-mr2-zeroday-release - do not merge

Change-Id: I13e45e13c3abf52cef3fb58de3f4707fb8fedaac