tree cba62d0d64153aa2169651696bc238591341d679
parent 7e23ffebe926a1818e6fae9a4cf4bb047309c099
parent 1b6b42e356f1365f23e2553a8718d4dfa9f52358
author Adam Cohen <adamcohen@google.com> 1414085519 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414085519 +0000

am 1b6b42e3: am ec6b71a0: am 531a5c32: am b0ee0810: Add guards for restoreInstanceState (issue 11982812)

* commit '1b6b42e356f1365f23e2553a8718d4dfa9f52358':