| commit | 2e099a5c586ada9d704a330d3955bb09703439ae | [log] [tgz] |
|---|---|---|
| author | Bill Yi <byi@google.com> | Fri Feb 20 00:36:44 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Feb 20 00:36:44 2015 +0000 |
| tree | 7f71b8c4282fdcb4d41ffd28e9c5b7c88f4adb45 | |
| parent | f6303459d1917cdbc956719b6e4a97ee2e4ba3f9 [diff] | |
| parent | a6c2bcc4b82cab8a828a14e7d1681d7ae1636e88 [diff] |
am a6c2bcc4: am 28d41f56: Merge commit \'26cc3d0b67ff4daf31eaeed0ecd87b391978aadb\' into HEAD * commit 'a6c2bcc4b82cab8a828a14e7d1681d7ae1636e88':