tree 2abc0368379e86315cd522b6ef3cb590cc4b09ff
parent 6c0477429be2289f8d6273721a59f36db9142c24
parent b7e92cf344c54af39d44905d5d8a4d9d79f6a5c4
author Tao Bao <tbao@google.com> 1446146449 +0000
committer android-build-merger <android-build-merger@google.com> 1446146449 +0000

Merge "Honor TARGET_NO_RECOVERY flag." am: c448e91c3d am: e5eb4567d4
am: b7e92cf344

* commit 'b7e92cf344c54af39d44905d5d8a4d9d79f6a5c4':
  Honor TARGET_NO_RECOVERY flag.