OSDN Git Service

am e1fc04ba: (-s ours) am ee011517: am c74825b1: Merge "Allow user to tap on lock...
authorAngus Kong <shkong@google.com>
Wed, 30 Apr 2014 18:14:34 +0000 (18:14 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 30 Apr 2014 18:14:34 +0000 (18:14 +0000)
commit16417f11286cc1cd5377a8160d4ebcdc105e4c76
tree3804e07840427a842ef1bdc750bffe2239123c26
parentcd4d020206c901270d2b2e84ee03c3b3d281d6d5
parente1fc04babedcb425e8e9c329d18b833846225a37
am e1fc04ba: (-s ours) am ee011517: am c74825b1: Merge "Allow user to tap on lock icon from secure camera." into gb-ub-photos-carlsbad

* commit 'e1fc04babedcb425e8e9c329d18b833846225a37':