| commit | e3950823b6126e16158d3c969c2bdd6d914b22dc | [log] [tgz] |
|---|---|---|
| author | Deepanshu Gupta <deepanshu@google.com> | Tue May 13 21:43:52 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue May 13 21:43:52 2014 +0000 |
| tree | 918aa76472024fbb17244a131096e2948158dc63 | |
| parent | 004bfbd36acff3d16979b4021630d19d1df6d826 [diff] | |
| parent | 465a99260ea1d868e9aa43d08e63cb85892f188e [diff] |
am 465a9926: am 21dc46b1: am 569dc64c: am 69ab5946: am fcfb8801: am 18b1525a: am ef24a509: am 900954e3: am 2100476a: am 31a3760a: am 964023c5: am 8bf73eae: am 0ad4f2ce: resolved conflicts for merge of 7377c7be to jb-mr1-dev * commit '465a99260ea1d868e9aa43d08e63cb85892f188e': Add Navigation Bar to BridgeWindowManager [DO NOT MERGE]