tree 42a68f08496d81e15fc7beec8703f1393a7d89b9
parent c66966d750f31aba21016bc357733846b4dd74c2
parent d1942b3abef512b014f7fa957bf62d720d2f6e09
author Philip P. Moltmann <moltmann@google.com> 1497974153 +0000
committer android-build-merger <android-build-merger@google.com> 1497974153 +0000

Merge "Correct lastId on onCreate with unexpected state" into oc-dev am: aed0c10d52
am: d1942b3abe

Change-Id: Icc42f18a220848b58cbe0035e726fdbb53df58e0