tree d9213fd1d8df9177d8f642856381472b85cdaa38
parent b0cc47efe5d7c200fe7d527c8c17d0854dfe3d35
parent f5e33985964c3e7acf6b9cd16d94a110e4f9a42d
author Neil Fuller <nfuller@google.com> 1445854283 +0000
committer android-build-merger <android-build-merger@google.com> 1445854283 +0000

Merge "Adjust for changes to libcore/Docs.mk"
am: f5e3398596

* commit 'f5e33985964c3e7acf6b9cd16d94a110e4f9a42d':
  Adjust for changes to libcore/Docs.mk