tree ed34ef48b170584425b0e7f37639bdfa2a2a341c
parent d12838890563b2fb4532630373760a995970f687
parent 507ea383aaaea5634c79d20911773aa44324e7f5
author Ying Wang <wangying@google.com> 1421959269 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1421959269 +0000

am 507ea383: Merge "Let apicheck check both the public API and system API." into lmp-mr1-dev

* commit '507ea383aaaea5634c79d20911773aa44324e7f5':
  Let apicheck check both the public API and system API.