OSDN Git Service

Reconcile with jb-mr2-release jb-mr2-zeroday-release jb-mr2-zeroday-deb-release ...
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 14 Aug 2013 19:09:27 +0000 (12:09 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 14 Aug 2013 19:09:27 +0000 (12:09 -0700)
commit04b40ee33e0f1649bedc9b0b9b3e277b6b37f164
tree1a2282125624d5f57c9d51378f5efdf872cbb07f
parent30e9065c2530d9db5e63807649f1054b4ee33033
parentfb381053d5547e4840a85f06b70781c7d35307ed
parent172b29e8b35ab441a4481ba8348cb30d596957ff
parent96706a21532fdfb84780f3986f2623ad78976b8c
Reconcile with jb-mr2-release jb-mr2-zeroday-release jb-mr2-zeroday-deb-release - do not merge

Change-Id: I498651fc3fa9b021570780e8b8848a806c31962f