tree 960a3f3cf0b2530bd56105b7e839de99324b33ff
parent 6b4b8e50c5645341f847ab22b044bcdb97aa70d0
parent d6bb9401eba5ec43b2e4a0f6a68e65ca37e5b213
author Fyodor Kupolov <fkupolov@google.com> 1499366508 +0000
committer android-build-merger <android-build-merger@google.com> 1499366508 +0000

Merge "Merge "Merge "Fix ContentObserver unregister issue" am: 09b6988e27" into stage-aosp-master am: 785ab04d7a" into oc-dev-plus-aosp
am: d6bb9401eb

Change-Id: Ie879dcf1b443563f5e3e55e15eb0dca8670d325d