tree 78e65487f0806f6a9f42c34fe2b35d6cdc7d9ebb
parent 0af622c1970973756aed5345f7f6fb30b8e49aa3
parent 067a7ac494c8a248840b9a7a46f22a0efff9e52f
author Craig Mautner <cmautner@google.com> 1354062195 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1354062195 -0800

am 067a7ac4: am 9e98927e: Merge "Retain configuration change info and sync access." into jb-mr1.1-dev

* commit '067a7ac494c8a248840b9a7a46f22a0efff9e52f':
  Retain configuration change info and sync access.