| commit | 900954e3cd135bf43db975961056e7661f26a6c6 | [log] [tgz] |
|---|---|---|
| author | Deepanshu Gupta <deepanshu@google.com> | Tue May 13 21:02:19 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue May 13 21:02:19 2014 +0000 |
| tree | 564f2b4bd26af36a9f21dc9ed687580246c654c3 | |
| parent | 7b9cc71063869a98f35b49c2e072750dfa46e0b9 [diff] | |
| parent | 2100476ace68858bc7b7356b33aa525e38795592 [diff] |
am 2100476a: am 31a3760a: am 964023c5: am 8bf73eae: am 0ad4f2ce: resolved conflicts for merge of 7377c7be to jb-mr1-dev * commit '2100476ace68858bc7b7356b33aa525e38795592': Add Navigation Bar to BridgeWindowManager [DO NOT MERGE]