OSDN Git Service

am 8104ac0c: Merge "Update the action bar in settings." into klp-dev
authorMindy Pereira <mindyp@google.com>
Sun, 15 Sep 2013 18:01:29 +0000 (11:01 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sun, 15 Sep 2013 18:01:29 +0000 (11:01 -0700)
commitae6067c4bd9e86ed8f4b48ec8c266c7d0caa822a
tree0b69d7659242140323acec8b1b811a43e5231135
parentcb46e0bcaee9b7110e5dc3402a4d5b127124dad5
parent8104ac0c5135508cad8e203ad1936a0c08d555a9
am 8104ac0c: Merge "Update the action bar in settings." into klp-dev

* commit '8104ac0c5135508cad8e203ad1936a0c08d555a9':
  Update the action bar in settings.