summaryrefslogtreecommitdiffstats
path: root/rs/java/android
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2015-02-04 20:37:59 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-02-04 20:37:59 +0000
commit4c49b1fb774d59d3a6e8a6bb5a4549828504c5af (patch)
treee75891e2bb4f3293198ddb05de5660308f870f94 /rs/java/android
parent9d25fcae8560a2e2bc2e28b08778bd1a94261cd1 (diff)
parentb2d7ca7c6ffbb460dd8a8f8cbac8b627a3e27718 (diff)
downloadframeworks_base-4c49b1fb774d59d3a6e8a6bb5a4549828504c5af.zip
frameworks_base-4c49b1fb774d59d3a6e8a6bb5a4549828504c5af.tar.gz
frameworks_base-4c49b1fb774d59d3a6e8a6bb5a4549828504c5af.tar.bz2
am b2d7ca7c: am fd2c1307: Merge "Fix build."
* commit 'b2d7ca7c6ffbb460dd8a8f8cbac8b627a3e27718': Fix build.
Diffstat (limited to 'rs/java/android')
0 files changed, 0 insertions, 0 deletions