tree 3d9a5451eb5ac85f8c18619c282eb82eb8fa2ddf
parent 17293d084a5811b991c409ad3dbbbd886608c497
parent 3a72b93e554bd22a5c64e71a6956d9604ce05108
author Youngsang Cho <youngsang@google.com> 1462934078 +0000
committer android-build-merger <android-build-merger@google.com> 1462934078 +0000

DO NOT MERGE Revert "DO NOT MERGE Sync to joey ub-tv-dev at e7fbaa585b1eb7afec05f05032d2e8d99fb595d4"
am: 3a72b93e55

* commit '3a72b93e554bd22a5c64e71a6956d9604ce05108':
  DO NOT MERGE Revert "DO NOT MERGE Sync to joey ub-tv-dev at e7fbaa585b1eb7afec05f05032d2e8d99fb595d4"

Change-Id: I92185703fb6b3eef0c5661d59ffabe1570f3eef0