| commit | d1ddf29901aef92e53e420e9937e9a4937569b9d | [log] [tgz] |
|---|---|---|
| author | Colin Cross <ccross@android.com> | Sat Sep 19 10:37:05 2015 -0700 |
| committer | Colin Cross <ccross@android.com> | Sat Sep 19 10:38:39 2015 -0700 |
| tree | 0f153da9c646cdc67d0432e5a248b1d713848674 | |
| parent | 7944e8ad6737309d0f64d180a450eaeebfc9865f [diff] | |
| parent | 5b5c81c4969c812976ad219a8513d91708981426 [diff] |
resolved conflicts for 5b5c81c4 to stage-aosp-master Change-Id: I0be665105d46cb3b934cb00890822d4dfae18f64