| commit | a5f8559152355033b4bdaea423460651df6d61ee | [log] [tgz] |
|---|---|---|
| author | Deepanshu Gupta <deepanshu@google.com> | Thu Aug 27 23:46:19 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 23:46:19 2015 +0000 |
| tree | 85c8017324e2357c479e01bef23304dc922aafed | |
| parent | 30ffb97146c975e9f9d2ed7377b5ae777748468d [diff] | |
| parent | 4db2aa3f469756cb59c5ff64bbd0a0862bdd45c4 [diff] |
am 4db2aa3f: (-s ours) am 35f6976e: am 7ec7805a: (-s ours) am 8a6295e8: am e481e713: Include Shapes in LayoutLib. [DO NOT MERGE] * commit '4db2aa3f469756cb59c5ff64bbd0a0862bdd45c4':