OSDN Git Service

am bc99ab0f: (-s ours) am 1d266660: am f51bebd5: Merge "Increased time to wait in...
authorpriya <priyar@google.com>
Wed, 30 Apr 2014 18:14:45 +0000 (18:14 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 30 Apr 2014 18:14:45 +0000 (18:14 +0000)
commit4b378ee0f8b02369a5f49a3432f877ae002699e8
tree3804e07840427a842ef1bdc750bffe2239123c26
parentcb87caaa3a7bb2c7a653c40d7b8d9fad9d10b1a5
parentbc99ab0fcabce48468185c1b0bce8c498ab18a62
am bc99ab0f: (-s ours) am 1d266660: am f51bebd5: Merge "Increased time to wait in all tests. For CameraLAtency.java got rid of the key event to get rid of geo tagging dialog on first launch of camera. That will be taken care of by pushing the shared_pref file." into klp-dev

* commit 'bc99ab0fcabce48468185c1b0bce8c498ab18a62':