OSDN Git Service

am 965db3e8: Merge "Actually remove settings" into ub-camera-glacier
authorAlan Newberger <alann@google.com>
Thu, 28 Aug 2014 18:07:46 +0000 (18:07 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 28 Aug 2014 18:07:46 +0000 (18:07 +0000)
commit1c390f772c03e6eb748407f8c812c7eac8119e03
tree1f9fc269197d7cef7858fd5a56e5b4dcd098c07e
parent640a86481390c705576a9cd92f988d02dd4b7ab8
parent965db3e8ca1416e418990344486b1008d1ebc8dd
am 965db3e8: Merge "Actually remove settings" into ub-camera-glacier

* commit '965db3e8ca1416e418990344486b1008d1ebc8dd':
  Actually remove settings