diff options
author | Jon Larimer <jlarimer@google.com> | 2015-01-29 19:45:56 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-01-29 19:45:56 +0000 |
commit | 4c2a6fddb10a8b4c00391d54371aaa14f5d901ce (patch) | |
tree | 006ae6ee2e87de03bf7a2145fa94add644bca76d | |
parent | feabeb624361c234279a03c6dcdb6a53ee48eddc (diff) | |
parent | 64bdf77d9515f587f31998b614e524c26b2415a4 (diff) | |
download | frameworks_base-4c2a6fddb10a8b4c00391d54371aaa14f5d901ce.zip frameworks_base-4c2a6fddb10a8b4c00391d54371aaa14f5d901ce.tar.gz frameworks_base-4c2a6fddb10a8b4c00391d54371aaa14f5d901ce.tar.bz2 |
am 64bdf77d: am 8bb65246: am a43742ec: am 6813f29e: am 76cdbb04: (-s ours) am d0318a63: am 7dd12d76: Merge "DO NOT MERGE Restore calling identity before checking permission" into jb-mr2-dev automerge: 48dad94 -s ours automerge: 6fe42f0 -s ours
* commit '64bdf77d9515f587f31998b614e524c26b2415a4':
0 files changed, 0 insertions, 0 deletions