tree 884d839f9381d8e979627461547dd1b504b098f9
parent 923938b6c9d303ae837fefc9e2101f9a221ba4a0
parent 392858626b0b4583a71372a9b05be94927958d2f
author Geoff Mendal <mendal@google.com> 1452544657 +0000
committer android-build-merger <android-build-merger@google.com> 1452544657 +0000

am 0baeee0c: (-s ours) am 79670bbe: (-s ours) Import translations. DO NOT MERGE
am: 392858626b  -s ours

* commit '392858626b0b4583a71372a9b05be94927958d2f':