OSDN Git Service

am cb7d69a6: am 6eb08885: am 0d4ad844: am 14f9d310: am 40b52050: am e684ea54: Merge...
authorAlan Newberger <alann@google.com>
Fri, 19 Sep 2014 23:29:55 +0000 (23:29 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 19 Sep 2014 23:29:55 +0000 (23:29 +0000)
commitd38eb93ffdda96e79ef48476fc767255315545d9
treedf1394a4523be21b97e35088d3b91e1b7c0d8cd5
parente4b772a426a11f268519785f3ac4e56cf4aedeed
parentcb7d69a6558c7f2f32a21ea4e9264ce867e63d3f
am cb7d69a6: am 6eb08885: am 0d4ad844: am 14f9d310: am 40b52050: am e684ea54: Merge "Fix CameraSettingsActivityHelper" into ub-camera-glacier

* commit 'cb7d69a6558c7f2f32a21ea4e9264ce867e63d3f':
  Fix CameraSettingsActivityHelper