| commit | 7f2cd8df473c82cc10d1914cd563ba1b63e22a54 | [log] [tgz] |
|---|---|---|
| author | Deepanshu Gupta <deepanshu@google.com> | Thu Jun 12 20:08:13 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jun 12 20:08:13 2014 +0000 |
| tree | 0567eafc1044fcdec0ac81c101e6011e1dff2ea2 | |
| parent | d0406a45e276b7940b5266a6cb827e48025c5513 [diff] | |
| parent | 1434ea749f669b09aff3f7a98859d2593da32f61 [diff] |
am 1434ea74: (-s ours) am 92b7c67e: Merge "LayoutLib fixes for API 20 [DO NOT MERGE]" into klp-modular-dev * commit '1434ea749f669b09aff3f7a98859d2593da32f61': LayoutLib fixes for API 20 [DO NOT MERGE]