| commit | 921a5f8940fa3a215cab807c8fbbbca428233e9b | [log] [tgz] |
|---|---|---|
| author | Bart Sears <bsears@google.com> | Fri Mar 27 01:25:58 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Mar 27 01:25:58 2015 +0000 |
| tree | 8c5e1828fb3fe2d42345cc695e74100abc9994fa | |
| parent | 879c3bf31ef39983f1ce6eb5e2bbdef8293d7467 [diff] | |
| parent | c3868ae37130a6c1c1a650d78bc26f394439d796 [diff] |
am c3868ae3: (-s ours) resolved conflicts for merge of 6d607ee7 to lmp-mr1-dev-plus-aosp * commit 'c3868ae37130a6c1c1a650d78bc26f394439d796': DO NOT MERGE - Bump version to 5.1.1