OSDN Git Service

am 4c2a6fdd: am 64bdf77d: am 8bb65246: am a43742ec: am 6813f29e: am 76cdbb04: (-s...
authorJon Larimer <jlarimer@google.com>
Thu, 29 Jan 2015 19:51:05 +0000 (19:51 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 29 Jan 2015 19:51:05 +0000 (19:51 +0000)
commiteb56f7a5dc66cb0ca54afd25a9d089e7931512df
tree7da41e730feea3fd3b2803c01ab321f2170ba189
parentac436d55fc128797f57f674541c6e77dd44b7416
parent4c2a6fddb10a8b4c00391d54371aaa14f5d901ce
am 4c2a6fdd: 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 '4c2a6fddb10a8b4c00391d54371aaa14f5d901ce':