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