| commit | 4433b4d2e2cd596f8a140fd441382cc5d7cb1be7 | [log] [tgz] |
|---|---|---|
| author | Stephen Hines <srhines@google.com> | Thu Aug 27 10:46:38 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 10:46:38 2015 +0000 |
| tree | ee3b26be086daa9c9cb3124d7da6216c8997109b | |
| parent | 0273010f0e508f308bc2ea7a1bf2449cc09e9aad [diff] | |
| parent | 67b8507660be6129adb2e58122d7f4daf7422bad [diff] |
am 67b85076: (-s ours) am 0ebc96e5: Merge changes from topic \'rebase-r239765\' * commit '67b8507660be6129adb2e58122d7f4daf7422bad':