| commit | 8bf73eae6c98532c8a597b885b948b9878555441 | [log] [tgz] |
|---|---|---|
| author | Deepanshu Gupta <deepanshu@google.com> | Tue May 13 17:58:14 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue May 13 17:58:14 2014 +0000 |
| tree | d8d44a76b049f12fc4f69f6aa141b89f790071fd | |
| parent | 5454be00b182b206bbc9dcd35b88da63631f7e8e [diff] | |
| parent | 0ad4f2cedde037c2b09a7f09c5f95f0984267c64 [diff] |
am 0ad4f2ce: resolved conflicts for merge of 7377c7be to jb-mr1-dev * commit '0ad4f2cedde037c2b09a7f09c5f95f0984267c64': Add Navigation Bar to BridgeWindowManager [DO NOT MERGE]