| commit | 83f35e496f0104dcdef202c2cae374d684d3c75c | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Wed Feb 01 02:00:13 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Feb 01 02:00:13 2017 +0000 |
| tree | fdc72b626b737ea040636aa98590ffa2ae7c3981 | |
| parent | 059ff6c87b0ec4c1911e87e3311d360bee2c0c53 [diff] | |
| parent | c63ad9910407b0e5fc7f9231154b59ae6150bada [diff] |
Merge stage-aosp-master into master. am: eda82090bf am: 980da0fc0f am: f9dd2fa97e am: c63ad99104 Change-Id: I56a120f89070a82dd33094c9ef00c5c84e0e9d08