| commit | ffa5ac80d22add04b1f35e129be6f2d53129ff96 | [log] [tgz] |
|---|---|---|
| author | Dan Austin <danielaustin@google.com> | Wed Sep 16 17:55:12 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Sep 16 17:55:12 2015 +0000 |
| tree | 5d7bb104c6703e6132dcbfb5c0ab6e9df3d526fe | |
| parent | 13815039dc94ec231ec033ac80e106d36338d081 [diff] | |
| parent | a209e45b900b8153e05afb2f378267f827394da4 [diff] |
am a209e45b: (-s ours) am 7dbed399: Merge "Revert "resolved conflicts for c82fcdda to stage-aosp-master"" into stage-aosp-master * commit 'a209e45b900b8153e05afb2f378267f827394da4': Revert "resolved conflicts for c82fcdda to stage-aosp-master"