tree 18e3d5cf0ba1efb4cabea9a0acc9ba9241a6bd2f
parent 19ad2072e8d568e745638abf7784ead88ff10ddf
parent 331caed355c0c1cee65d37a6a04c793e781b40a1
author Jeff Davidson <jpd@google.com> 1482948675 +0000
committer android-build-merger <android-build-merger@google.com> 1482948675 +0000

Merge "Add some missing @Deprecated annotations." am: 9424680a52 am: c8fd88131e am: ba4ed71528
am: 331caed355

Change-Id: I09b2f13aa13cedc6cb7e28ec4283e3f0aa466cb9