OSDN Git Service

Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 13 Jun 2013 15:22:30 +0000 (08:22 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 13 Jun 2013 15:22:30 +0000 (08:22 -0700)
commit1e6cb5a8f26420bf94c6bc194d95002d9366caa4
tree098e78cb209cb21ff6d1b0e55bb233dfbed6ce92
parentd8ef19b0c8a57daea726ad93edbbe396b9e9f5d3
parent8168ebb464459740047e5d8424141dd5bc1b045c
parentd6ab7c62efd634f822233567e050fa091fa4b324
Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge

Change-Id: I986e60e5558ca20ee361e768c46692bbbfc46237