tree 31c426a5d931387a9fb58b8f206425766ff21c4b
parent 69c743aadadb73e9f58e83f9a52096a9727d8dbc
parent df5d8cbbb8c943f73202b4ac59319d4a72fe8bb8
author Yi Kong <yikong@google.com> 1493248741 +0000
committer android-build-merger <android-build-merger@google.com> 1493248741 +0000

Merge "Update bionic after Clang rebase" am: 82f7208ac0 am: 001a69a9de
am: df5d8cbbb8

Change-Id: I042c3230fae92d5151a47fcf35ce7ddfa777a370