| commit | a209e45b900b8153e05afb2f378267f827394da4 | [log] [tgz] |
|---|---|---|
| author | Dan Austin <danielaustin@google.com> | Wed Sep 16 17:24:00 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Sep 16 17:24:00 2015 +0000 |
| tree | f546147739a4ccb1c72db453bd96594fc84443a4 | |
| parent | 683c0daa1294acaa023d976eef51850519c4cb17 [diff] | |
| parent | 7dbed399cbef000e3131464f9051db6aceffda7e [diff] |
am 7dbed399: Merge "Revert "resolved conflicts for c82fcdda to stage-aosp-master"" into stage-aosp-master * commit '7dbed399cbef000e3131464f9051db6aceffda7e': Revert "resolved conflicts for c82fcdda to stage-aosp-master"