tree fe04187521e4c327bf2d859484b33e79506539fe
parent f84fedf2d4e59a220e2ce6cdaf371c304abd1312
parent 3c688678642e2fa851484b37420d9871701aa651
author Yu Liu <yudiliu@google.com> 1492566407 +0000
committer android-build-merger <android-build-merger@google.com> 1492566407 +0000

Merge "Remove newly added remove methods in Location and deprecate the old ones, this is the request from the android API council Test: Existing unit tests still pass. BUG: 36552859" into oc-dev am: 500c1d0749
am: 3c68867864

Change-Id: I3233a604cda1ca48fad524b5c02d54847d67cfc0