| commit | 69ab594625e274ed4ca6d4a1dc7f8fb19d44f020 | [log] [tgz] |
|---|---|---|
| author | Deepanshu Gupta <deepanshu@google.com> | Tue May 13 21:23:47 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue May 13 21:23:47 2014 +0000 |
| tree | b2c0dd8cbc10eef7075cd174a78e612def3257a0 | |
| parent | cdc40eb0e02e5b7abc05a438f7fd51045ec91862 [diff] | |
| parent | fcfb8801b27fd40ff27c380b8bad9b9a210effca [diff] |
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 'fcfb8801b27fd40ff27c380b8bad9b9a210effca': Add Navigation Bar to BridgeWindowManager [DO NOT MERGE]