| commit | 8add9962a5c88ff307d573be91bb091a2b14568d | [log] [tgz] |
|---|---|---|
| author | Wink Saville <wink@google.com> | Thu Aug 21 17:38:57 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 21 17:38:57 2014 +0000 |
| tree | da27673a2cd4d5f46afe1a3506325e85fdaeb757 | |
| parent | 1944e19cb1dc82a52d46a42fe8a0ed4037602565 [diff] | |
| parent | f13aadfb6dfc707520809dbf4502e3001fd1424b [diff] |
am f13aadfb: am d1439291: Revert "Merge commit \'e887563a\' into fix-merge-conclict" * commit 'f13aadfb6dfc707520809dbf4502e3001fd1424b':