| commit | 3f84453c83b4c5d11ae0159e6d22f25865eb1fe4 | [log] [tgz] |
|---|---|---|
| author | Daniel Xie <dxie@google.com> | Tue Sep 22 23:13:55 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Sep 22 23:13:55 2015 +0000 |
| tree | 66eb82c6d0e33cf5bb1afad78b51cec4abc27c95 | |
| parent | 12aba5ffc23e366674a808500a4f34a844e7224f [diff] | |
| parent | fc19d13525955e1ee2dad6cbba32fefbef5f8e70 [diff] |
am fc19d135: (-s ours) am eaba159b: (-s ours) DO NOT MERGE ANYWHERE: fix breakage * commit 'fc19d13525955e1ee2dad6cbba32fefbef5f8e70': DO NOT MERGE ANYWHERE: fix breakage