summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThe Android Automerger <android-build@google.com>2015-03-26 21:19:47 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-03-26 21:19:47 +0000
commit51160caf9cb3f85a5ad3e89cbf794563c017c7af (patch)
treed773639dfaaf0127283b4494f54a74d44a1e324a
parent58afc3547e1b05175153a20d8d340ce3ee97ba7d (diff)
parentaae99eaa148ad74efbcd1519cc34363823e3c560 (diff)
downloadandroid_packages_apps_Trebuchet-51160caf9cb3f85a5ad3e89cbf794563c017c7af.tar.gz
android_packages_apps_Trebuchet-51160caf9cb3f85a5ad3e89cbf794563c017c7af.tar.bz2
android_packages_apps_Trebuchet-51160caf9cb3f85a5ad3e89cbf794563c017c7af.zip
am aae99eaa: am b2b58c8f: merge in lmp-mr1-sdk-release history after reset to lmp-mr1-ub-dev
* commit 'aae99eaa148ad74efbcd1519cc34363823e3c560': fix build fix build
0 files changed, 0 insertions, 0 deletions