OSDN Git Service

am b32da7b5: am 5dfe8261: Merge "Add @hide and @SystemApi to HdmiTimerRecordSources...
authorJungshik Jang <jayjang@google.com>
Thu, 24 Jul 2014 19:47:46 +0000 (19:47 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 24 Jul 2014 19:47:46 +0000 (19:47 +0000)
* commit 'b32da7b59497b1b569b8fe71c32747e8a45a6997':
  Add @hide and @SystemApi to HdmiTimerRecordSources


Trivial merge