tree 69d32e1974eb94f5dc4d1d0190bb0fc28c270f8b
parent 000532323b344e2c9771e829a10c86310a2aa63f
parent 9172187468ea2f2b760c38919b698ca9216bbe08
author Qiwen Zhao <zhao@google.com> 1416421419 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1416421420 +0000

Merge "Import translations. DO NOT MERGE - Update prebuilt SDK to LMX50" into lmp-mr1-dev