tree 07e4dd6271c15eb27008a72bd5c631aad9aefc4f
parent 8b6838c5afafbc74cb0182490cf06d6ee180b40f
parent e7bca94d811e59bbcb93cbc0bde5087bbb067cb7
author TreeHugger Robot <treehugger-gerrit@google.com> 1500954933 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1500954933 +0000

Merge "Rename resetInternalState to resetInternalStateLocked"