summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlice Yang <alice@google.com>2013-04-30 14:05:36 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-04-30 14:05:36 -0700
commit6055ae8a536669ace062e3bf93d898493a7666dd (patch)
treeab989a58a37927754311fb8421b73f900930b71e
parent8a1f3ef028620e0020739b0bb2acd38e4933a459 (diff)
parent8ed0b767325296104e67a86671113f0329257cf1 (diff)
downloadandroid_frameworks_ex-6055ae8a536669ace062e3bf93d898493a7666dd.tar.gz
android_frameworks_ex-6055ae8a536669ace062e3bf93d898493a7666dd.tar.bz2
android_frameworks_ex-6055ae8a536669ace062e3bf93d898493a7666dd.zip
am 8ed0b767: am 7eff765c: Merge remote-tracking branch \'goog/jb-mr2-dev\' into ur9
* commit '8ed0b767325296104e67a86671113f0329257cf1':
0 files changed, 0 insertions, 0 deletions