| commit | 0cc468dc2a1420d5c9dac563cc6c5d11b862ff47 | [log] [tgz] |
|---|---|---|
| author | Narayan Kamath <narayan@google.com> | Sat Sep 12 08:49:20 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Sep 12 08:49:20 2015 +0000 |
| tree | f39e4b7c0da5ee7ee4a0a7b5ea9e23f962536a56 | |
| parent | 2e64e9590a36511eaaf655b24002d24afe927f04 [diff] | |
| parent | fef9dffd96e8bc6f2283a57cd0b29df4be43eb46 [diff] |
am fef9dffd: (-s ours) am 6c53de92: Follow up to change b638126ed DO NOT MERGE. * commit 'fef9dffd96e8bc6f2283a57cd0b29df4be43eb46': Follow up to change b638126ed DO NOT MERGE.