OSDN Git Service

Reconcile with jb-mr2-zeroday-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 26 Jun 2013 19:33:30 +0000 (12:33 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 26 Jun 2013 19:33:30 +0000 (12:33 -0700)
commit2f6542daa3362e99bf0d09777b3c9913cb0fd85c
tree5d69b611f52bd0a9b80be9fab3e394cf21528fd8
parent72912851ec38b96570ab60d19c175db1c73d53b5
parentc49f53924a27eb37cd531a7976b33d2a13ce8532
Reconcile with jb-mr2-zeroday-release - do not merge

Change-Id: I6e7a1cf99db622b61d2e35c1bc27eece9ec9dcc7