OSDN Git Service

Reconcile with jb-mr2-release jb-mr2-deb-factory-release jb-mr2-zeroday-release ...
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 2 Jul 2013 19:33:17 +0000 (12:33 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Tue, 2 Jul 2013 19:33:17 +0000 (12:33 -0700)
commit585332c9e4ea588ccb310c6fa8b1137c6a6086be
tree99d99679207653edc3421e8035afb99e6613e5fb
parent29344bdfd9c130fdb012f7687122828b2073741a
parentafc26fabcffde624f20327efa627206ca5cfddc2
parentb5eab6a2ec27ca32807207a8ca0e5bcdf33d07bb
parent0b001bdbb17ee6bd169ee2b1e3f11c2a4adf9f03
Reconcile with jb-mr2-release jb-mr2-deb-factory-release jb-mr2-zeroday-release - do not merge

Change-Id: Iae120841f91c3c12600a6f993c498f292f1cf0b2