summaryrefslogtreecommitdiffstats
path: root/api
diff options
context:
space:
mode:
authorJungshik Jang <jayjang@google.com>2014-07-24 19:58:29 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-07-24 19:58:29 +0000
commit5748d583db48ca0a21c9710c59ecdbf76c6cca58 (patch)
tree16e410e7672bc4509833fdc26c54f5c8cf98fc4a /api
parent7d2d06ffb52360dfe068e9d66168600205bf74c8 (diff)
parentb53fa20a5d9e0761c150b2c82dfb5f484db86519 (diff)
downloadframeworks_base-5748d583db48ca0a21c9710c59ecdbf76c6cca58.zip
frameworks_base-5748d583db48ca0a21c9710c59ecdbf76c6cca58.tar.gz
frameworks_base-5748d583db48ca0a21c9710c59ecdbf76c6cca58.tar.bz2
am d0296ddb: am b32da7b5: am 5dfe8261: Merge "Add @hide and @SystemApi to HdmiTimerRecordSources" into lmp-dev
* commit 'd0296ddb76a1faf06fa319881b2e1509398c5597': Add @hide and @SystemApi to HdmiTimerRecordSources
Diffstat (limited to 'api')
0 files changed, 0 insertions, 0 deletions