tree 438674c87e90af3938d1a5a0e61576c252a59078
parent d5e8edfe1de4ed1a3ca5556507b96bc9bf4aba21
parent 2ae4d32ca37cb1892477304d5d3b0fa676abdaaf
author Yi Kong <yikong@google.com> 1470766556 +0000
committer android-build-merger <android-build-merger@google.com> 1470766556 +0000

Merge "Track libcore change ee24b6322448ac919231a668e308ebd719aa52d7" am: 67aaa079ee
am: 2ae4d32ca3

Change-Id: I279138f6f7d585b2358537f129561d04c531dd00