| commit | 2398dad2e3a4f779fa50842012b8f01b541fec57 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Wed Feb 01 01:57:49 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Feb 01 01:57:49 2017 +0000 |
| tree | 42b0372e8290f1feba705732bd7e3b764e25e9fe | |
| parent | 2d50d87217f48159e3e99bd05b98d4ca1d88f400 [diff] | |
| parent | f398e32f586c6eebfe263e00b7c429009ce4bb14 [diff] |
Merge stage-aosp-master into master. am: 2b86ddb47d am: 6806bc7ae0 am: f398e32f58 Change-Id: I9780ec00c71dc99759bf6e4c498175143c2d08d3