tree 97872b62c925908d896fe3b37cefd9ae38b6ca17
parent 214e6867c5339468a960e8b8a20c535c99eb9e57
parent 919ecb221f2132f4d907a2e37cf021e17538762d
author David Friedman <dmail@google.com> 1419044716 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1419044716 +0000

am 919ecb22: am 58a5e3db: Merge "Android TV initial (time-sensitive) localization release for Japanese partners. Bug: 18527238 Change-Id: Id933695738a07aa0a1c02783e022dd8b98bbf98e" into lmp-docs

* commit '919ecb221f2132f4d907a2e37cf021e17538762d':
  Android TV initial (time-sensitive) localization release for Japanese partners. Bug: 18527238 Change-Id: Id933695738a07aa0a1c02783e022dd8b98bbf98e