tree 99ba75fdd007942f673c2a30e45cb515fc462c59
parent 30975ad80b1a1cbb25f905805b23fcdd68ac6980
parent 7595478ff2c8da07311da19d2e402ed90ed7fc8f
author Chris Wren <cwren@android.com> 1466545943 +0000
committer android-build-merger <android-build-merger@google.com> 1466545943 +0000

Merge \"registerUpdatedByApp should be synchronized\" into nyc-dev
am: 7595478ff2

Change-Id: I78349914370d1a72f616b4ee8cd7188fe0a416c1