| commit | bd2c5d3e81553e0152eeadffa1e6be3bf90a6e08 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Tue May 13 15:20:28 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue May 13 15:20:28 2014 +0000 |
| tree | d593cb34b8e2adbe2c14ae99554c7d5824f3cbed | |
| parent | 5d6c9110d5eb85199f654bf782616937cee3d7e0 [diff] | |
| parent | 03db73bd369600350c7a70278686330ce32804ee [diff] |
am 03db73bd: (-s ours) am ca5371cd: (-s ours) am b287fd3b: (-s ours) am 96a440d5: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev * commit '03db73bd369600350c7a70278686330ce32804ee':