tree 5dd265aa1f53afee3443c97432790a51483c612c
parent cf973b13a9495be8feadb526a0f09788c132c096
parent b64dea3607ee12b3fd0e164b5c5fc90791bcdccd
author David Friedman <dmail@google.com> 1420584272 +0000
committer android-build-merger <android-build-merger@google.com> 1420584272 +0000

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

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