tree a31aaf99880598214343c56e5f92c9e556474a12
parent e88d14a8b8101248ce0a3b3b00993fd1393f6be2
parent 499c7eeb9ad59e5449481eb871db24a176f2ccdb
author John Spurlock <jspurlock@google.com> 1383706236 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1383706236 -0800

am 499c7eeb: Merge "Update remaining settings icon with old style." into klp-dev

* commit '499c7eeb9ad59e5449481eb871db24a176f2ccdb':
  Update remaining settings icon with old style.