| commit | 9cc952e74a8f82b85a9bd8cbd7cbfb286c9b65d6 | [log] [tgz] |
|---|---|---|
| author | Deepanshu Gupta <deepanshu@google.com> | Tue May 13 20:57:20 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue May 13 20:57:20 2014 +0000 |
| tree | 1629b381d37037c68755d90861a8b41d13113a58 | |
| parent | 84f5aceabd57f349b0e43c0cf45bc2ff76873ee1 [diff] | |
| parent | b7b64cc4884e933d0da4664ce7195caa5003ef65 [diff] |
am b7b64cc4: am e0105901: am 52b49665: am eff94bc3: am 8c19c6a1: am 16f3a616: am c0e9c66d: resolved conflicts for merge of 8e015b7b to jb-mr1.1-dev * commit 'b7b64cc4884e933d0da4664ce7195caa5003ef65': Action bar rendering in layoutlib [DO NOT MERGE]