tree e981d40fc5722dd73d3b5cf3118b670869152a64
parent 084c4d73e7099b3d0c5d9ba73d6d68f85da23ed8
parent d34da3b6592c1d0431c5cfa79dc2be312a5e1d3b
author Dave Langemak <dlangemak@google.com> 1467906970 +0000
committer android-build-merger <android-build-merger@google.com> 1467906970 +0000

Merge \\"Hide APIs that shouldn\\'t have been public\\" into nyc-mr1-dev am: 8317f93012
am: d34da3b659

Change-Id: I49e9fc1f0f58db9f6200b954b5b639ac263ca8da