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, 6 Jun 2013 17:37:16 +0000 (10:37 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 6 Jun 2013 17:37:16 +0000 (10:37 -0700)
commit25c8c528101360119f2aafc1871811cc1a5ad519
tree70e1fb2290d3f75eea762ff25bb497819a2f97d2
parent4dd110ae6d9f00e1ec036f697045f4b3326b7873
parent5c192e5d4fcec8aa2dd14be539ac28ffff4a12fa
parent1f8600a320ccd9f8b6e9b2f8f8fb0f011832caa3
Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge

Change-Id: I0aa9bb7e725a8352da3eae512c2a62df4f12e3b3