| commit | f46900c5eaeff0fbba7f20466be87db67002d6bf | [log] [tgz] |
|---|---|---|
| author | Deepanshu Gupta <deepanshu@google.com> | Tue May 13 20:38:15 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue May 13 20:38:15 2014 +0000 |
| tree | 3b40011469d381fb81770104918e067cf41bb89f | |
| parent | 8c19c6a17d8a019086a36988937462acfb6b830f [diff] | |
| parent | 87a54055e61918986021eb5e1e3dbefe40839367 [diff] |
am 87a54055: am 5878115a: resolved conflicts for merge of 9978c036 to jb-mr1.1-dev * commit '87a54055e61918986021eb5e1e3dbefe40839367': Overflow menu popup for Action Bar in Layoutlib [DO NOT MERGE]