tree e98fac7a14a87dd0ac5c148a9838afdd4f0a6e29
parent 8ab024a1e2ffc639ab94d8219b052a938231ccdb
parent 6697ed5d4e08ce12f81ab812928537e41bca57f8
author Chih-Chung Chang <chihchung@google.com> 1274673999 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1274673999 -0700

am e12a2a47: Merge "Disable CameraServiceTest in a normal build." into kraken