diff options
| author | Deepanshu Gupta <deepanshu@google.com> | 2014-05-13 17:58:14 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-05-13 17:58:14 +0000 |
| commit | 8bf73eae6c98532c8a597b885b948b9878555441 (patch) | |
| tree | d8d44a76b049f12fc4f69f6aa141b89f790071fd /core/java/android/accounts/AccountManager.java | |
| parent | 5454be00b182b206bbc9dcd35b88da63631f7e8e (diff) | |
| parent | 0ad4f2cedde037c2b09a7f09c5f95f0984267c64 (diff) | |
| download | frameworks_base-8bf73eae6c98532c8a597b885b948b9878555441.zip frameworks_base-8bf73eae6c98532c8a597b885b948b9878555441.tar.gz frameworks_base-8bf73eae6c98532c8a597b885b948b9878555441.tar.bz2 | |
am 0ad4f2ce: resolved conflicts for merge of 7377c7be to jb-mr1-dev
* commit '0ad4f2cedde037c2b09a7f09c5f95f0984267c64':
Add Navigation Bar to BridgeWindowManager [DO NOT MERGE]
Diffstat (limited to 'core/java/android/accounts/AccountManager.java')
0 files changed, 0 insertions, 0 deletions