OSDN Git Service

Reconcile with jb-release
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 22 Jun 2012 19:37:02 +0000 (12:37 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Fri, 22 Jun 2012 19:37:02 +0000 (12:37 -0700)
commitec0f69a81a4a8ce1c424ec5f4768e86548300891
tree9420eef08da49a7444ec963598aee621a9915efc
parent84e518ebcd0e9edd4b27ea5f7be181d4532e88b5
parentba189634276dad950b6ffd9c7210ab5183633edd
Reconcile with jb-release

Change-Id: I8e514e78efc61e6d7cab247e3c6979a6459bcd55