commit | ad75b685e508e47847043fbe422282e56849e3a9 | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Thu Jan 12 05:16:21 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Thu Jan 12 05:16:21 2017 +0000 |
tree | b693e5db134daec4fa77dedb3f3408d1168ffbd8 | |
parent | 5fe9435edb6630b60cdf5a2a656887d05d419502 [diff] | |
parent | eb7ba88b5b2712c94b22230042ad30b894eb0271 [diff] |
Merge commit '03aa215cccab68da5fdfe000029201982edebe68' into stage-aosp-master. am: eb7ba88b5b Change-Id: I1c577ee17ec238f73ed19a3657fd8ef10c102ef2