summaryrefslogtreecommitdiffstats
path: root/api
diff options
context:
space:
mode:
authorVictoria Lease <violets@google.com>2012-08-20 13:11:43 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-08-20 13:11:43 -0700
commit6fb73ab83f9c1b745ccff4fb92babb429b9215ee (patch)
tree38ee7d78b1cad96b5292be2b85648c761acbc343 /api
parent80618d66b02d8cce325cdaa184435f43818a062b (diff)
parentac1cbaf2e5575ac75a0160e13089d51a0bb232fa (diff)
downloadframeworks_base-6fb73ab83f9c1b745ccff4fb92babb429b9215ee.zip
frameworks_base-6fb73ab83f9c1b745ccff4fb92babb429b9215ee.tar.gz
frameworks_base-6fb73ab83f9c1b745ccff4fb92babb429b9215ee.tar.bz2
Merge "DO NOT MERGE Han Preference" into jb-mr1-dev
Diffstat (limited to 'api')
0 files changed, 0 insertions, 0 deletions