tree c949a0f1b4068b2a7ba5296de43054f292e64726
parent 4ad02d02b8a27c627eace2bdf1fe8e0b3cfe08fb
parent 78f5c4d5372e38b5a5d1e2f3e3b732951a76f007
author Elliott Hughes <enh@google.com> 1347329026 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1347329026 -0700

am 78f5c4d5: am 76ddf411: Merge "Fix /proc/version parsing in Settings."

* commit '78f5c4d5372e38b5a5d1e2f3e3b732951a76f007':
  Fix /proc/version parsing in Settings.