| commit | 2cfa663f10b8efaed85b5f83b48211da0228aa31 | [log] [tgz] |
|---|---|---|
| author | Wink Saville <wink@google.com> | Fri Mar 20 23:15:05 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Mar 20 23:15:05 2015 +0000 |
| tree | 298bf379e2d05489ab6d5907221d22778bb1e885 | |
| parent | 2d53af1c3898c887d09e19ca8474c6b6e986a11c [diff] | |
| parent | f95440f837799b2ffa6aea68dbdb3251550a9b79 [diff] |
am f95440f8: am 8add9962: am f13aadfb: am d1439291: Revert "Merge commit \'e887563a\' into fix-merge-conclict" * commit 'f95440f837799b2ffa6aea68dbdb3251550a9b79':