| commit | ab6617cb2b7dd6272b2e0b53a2e7e13630f24a1f | [log] [tgz] |
|---|---|---|
| author | Appu Goundan <appu@google.com> | Mon Jul 13 21:29:33 2015 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Mon Jul 13 21:29:33 2015 +0000 |
| tree | 3e5cf859a8ed90bffadc44d7999a298972b39d4e | |
| parent | e5e84e50dd9942af6ef269548040de31fda83f91 [diff] | |
| parent | 4c03ac92588f7ca0f87277e669e804eecedbf039 [diff] |
Merge remote-tracking branch \'aosp/upstream-github\' automerge: f5e68c3 automerge: 4c03ac9 * commit '4c03ac92588f7ca0f87277e669e804eecedbf039': Merge remote-tracking branch 'aosp/upstream-github'