| commit | 425e02e7ee2f423fca8961d8fcc11385a3f99dd6 | [log] [tgz] |
|---|---|---|
| author | Appu Goundan <appu@google.com> | Tue Jul 14 15:19:08 2015 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Jul 14 15:19:08 2015 +0000 |
| tree | 746552a8620c1c21e319dbac8509b0abb247e00a | |
| parent | 53466f05fb3670bb6c52c30b36ec9d0d1919fa03 [diff] | |
| parent | c31b469dcbcc683b29599a880b05fc1e736117c5 [diff] |
Merge remote-tracking branch \'aosp/upstream-github\' automerge: 02742da automerge: c31b469 * commit 'c31b469dcbcc683b29599a880b05fc1e736117c5': Merge remote-tracking branch 'aosp/upstream-github'