tree 2cf425dc1030772f8e0b73e96d70616fd9787a9c
parent 03bb2d7cfe9429de6cf9793e06a5e62bf5083f25
parent cd3b346b33bbd4d6c0178a5dbb9c89c4f37e001c
author Josh Gao <jmgao@google.com> 1473361137 +0000
committer android-build-merger <android-build-merger@google.com> 1473361137 +0000

Merge "versioner: add support for __VERSIONER_NO_GUARD." am: 3afa18104b am: 7f5236ad4a
am: cd3b346b33

Change-Id: I8f07c83372a02d7d56d3aa4150c608f743230614