tree fb402e0e2bda1328fd9858b28a98e1c29563f038
parent 3a72b93e554bd22a5c64e71a6956d9604ce05108
author Youngsang Cho <youngsang@google.com> 1462845132 -0700
committer Youngsang Cho <youngsang@google.com> 1463523290 -0700

DO NOT MERGE Sync to joey ub-tv-dev at e7fbaa585b1eb7afec05f05032d2e8d99fb595d4

Bug: 28469968
Change-Id: I74e368f5f58b433755932b806a90178e37bea7f9