tree fb402e0e2bda1328fd9858b28a98e1c29563f038
parent dd43de1bb0d2ce8c5dcad0e68f23ffb9281d9133
parent 48dadb49248271b01997862e1335912a4f2e189f
author Youngsang Cho <youngsang@google.com> 1463673462 +0000
committer android-build-merger <android-build-merger@google.com> 1463673462 +0000

DO NOT MERGE Sync to joey ub-tv-dev at e7fbaa585b1eb7afec05f05032d2e8d99fb595d4
am: 48dadb4924

* commit '48dadb49248271b01997862e1335912a4f2e189f':
  DO NOT MERGE Sync to joey ub-tv-dev at e7fbaa585b1eb7afec05f05032d2e8d99fb595d4

Change-Id: Iba1583607358d7c01bdbf1973d8365d44de39297