tree ef4942d01886dda7ad560ef1cb13ece9d2df9e0c
parent de574e33badcb0a440d884cb40dabfe91b8b48da
parent e63def17c20125c5819fe226257dccdcb367da98
author Android Build Merger (Role) <android-build-merger@google.com> 1474071882 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1474071885 +0000

Merge "Merge "Add build target for generating navtree json with all inherited members." into nyc-dev am: 3d47dc03db am: 934755b5f3" into nyc-mr1-dev-plus-aosp