| commit | 15a0ce40c6c738485a71d65beea16c44f1f66867 | [log] [tgz] |
|---|---|---|
| author | Stephen Hines <srhines@google.com> | Thu Aug 27 10:49:43 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 10:49:43 2015 +0000 |
| tree | 31930a291c99fe616059e735ef57023eff11a9c7 | |
| parent | c6cd58267bd8b0d7b1fd42787a31562307de8ab2 [diff] | |
| parent | 3a39cfb0cb8328c512aeb3bf93d0d8b28659032c [diff] |
am 3a39cfb0: (-s ours) am 0896d8e6: am b49f3460: Merge "Fix alias metadata issues." * commit '3a39cfb0cb8328c512aeb3bf93d0d8b28659032c':