OSDN Git Service

Reconcile with jb-mr0-release jb-release
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 19 Jul 2012 15:35:48 +0000 (08:35 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 19 Jul 2012 15:35:48 +0000 (08:35 -0700)
commit2e5ae9873c4f62f90342cd042eff457c7e1103f0
tree42a0d1146540bb086c638f6b6e1fd72809d6e7e4
parent3fae8d4e5685e604cc1dcc3c72745d6b521cfdc1
parentbdd2ce0061363c9f438ef0c2ec51115dac138577
parent516c242b31f81c2308a868323f87c0da5ce16756
Reconcile with jb-mr0-release jb-release

Change-Id: Id8ba9e1858f97ba17d9f9b9080c0e18c0bebfa7b