tree 983237637a8c852edd84c1b48d9f97fb966739e5
parent 30cd1890fbd864cb4f066797705ea51e01e28d5f
author Wenyi Wang <wenyiw@google.com> 1467056574 -0700
committer Wenyi Wang <wenyiw@google.com> 1467401313 -0700

Merge src-N/ and src-pre-N/ and target API 24 (1/3)

Bug 29725318
Bug 29328819
Bug 29536552

Change-Id: I21854806fbf5c9a6e0fff3d12702bfaa96e04b26