tree 011f40d5cd52450bfc1b2c7e6872bd0217630d2a
parent ebc2872929177c4780c68a0371a44c25f89a4f1f
parent 7ed145493d3f5bea32c567980f77cc42f613197e
author Deepanshu Gupta <deepanshu@google.com> 1420582956 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1420582956 +0000

am 7ed14549: am 7081a114: Merge "Add preferences rendering." into lmp-dev

* commit '7ed145493d3f5bea32c567980f77cc42f613197e':
  Add preferences rendering.