| commit | 27a0be36eeee9d1d03076727977dfb1e725fcd77 | [log] [tgz] |
|---|---|---|
| author | Christopher Wiley <wiley@google.com> | Mon Sep 14 07:34:50 2015 -0700 |
| committer | Christopher Wiley <wiley@google.com> | Mon Sep 14 07:34:50 2015 -0700 |
| tree | 986c8ee39b8906a1fb40b1bfba52d94e71085827 | |
| parent | 19694a0eeffd224189615ed761a5f8e4f912b343 [diff] | |
| parent | ddf53180e47cd4d31ba6bc762e98670898b040c9 [diff] |
resolved conflicts for ddf53180 to stage-aosp-master Change-Id: I265ab876ef29dc731e6abb6f964c10f2e71324be