summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThe Android Open Source Project <initial-contribution@android.com>2012-10-15 07:38:52 -0700
committerThe Android Open Source Project <initial-contribution@android.com>2012-10-15 07:38:52 -0700
commit5788646d57c764d16e38b46b0eff15358989be26 (patch)
treea2972e7fb778f9aeb032ec27c41a42db9524c66a
parente209312c5f2784bf746c24e7708b76b9f2e69b7f (diff)
parentad8b3bf02c68e36aefe8fde138d715e6cd235812 (diff)
parentcfe83324943c8f5c4aabd8293700387481d6f3e3 (diff)
downloadandroid_frameworks_ex-5788646d57c764d16e38b46b0eff15358989be26.tar.gz
android_frameworks_ex-5788646d57c764d16e38b46b0eff15358989be26.tar.bz2
android_frameworks_ex-5788646d57c764d16e38b46b0eff15358989be26.zip
Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
Change-Id: I312e1f2eefcdb6378d1dfbcdde2ed26d8a2da6b4