| commit | af72d494d2f2e7872e268df710b7f96b5631fe60 | [log] [tgz] |
|---|---|---|
| author | Deepanshu Gupta <deepanshu@google.com> | Thu Aug 27 23:49:43 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 23:49:43 2015 +0000 |
| tree | 85c8017324e2357c479e01bef23304dc922aafed | |
| parent | e399f05dc6ddc8acb638a1b84001374df855544c [diff] | |
| parent | 8d2e0fbc2ee7205afc06913a5fb2627001afcc24 [diff] |
am 8d2e0fbc: (-s ours) am 554f3a35: am 34f6f597: (-s ours) am 4a213763: am 5ad4dae1: Fix theme namespace in tests. [DO NOT MERGE] * commit '8d2e0fbc2ee7205afc06913a5fb2627001afcc24':