summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThe Android Open Source Project <initial-contribution@android.com>2012-07-27 14:50:58 -0700
committerThe Android Open Source Project <initial-contribution@android.com>2012-07-27 14:50:58 -0700
commit737011de92eb9d6a0a0757d1533ac43d16a228a3 (patch)
tree504a9c9f6d6416c2a721b4bb7bb80051a4c2ae7c
parentaacf2e3ee09a786a35cc763245343d60347eaa9d (diff)
parent896001c7bf385daa0e1027a96056ba554173baeb (diff)
parent6c1b50da9232dc579e62a53e8bdff895a1e12b9b (diff)
downloadcrespo4g-737011de92eb9d6a0a0757d1533ac43d16a228a3.tar.gz
Reconcile with jb-mr0-release jb-release
Change-Id: Iad1ef690b45ebdc9a37610cc7d2a779d69324ebd