| commit | 7ee3b85eba08304cb9e396aaf52a77729f125532 | [log] [tgz] |
|---|---|---|
| author | Colin Cross <ccross@android.com> | Mon Sep 28 18:45:23 2015 -0700 |
| committer | Colin Cross <ccross@android.com> | Mon Sep 28 18:45:23 2015 -0700 |
| tree | 86bbf69742b3539511a0797689d5b6e95dae0bc7 | |
| parent | 98da13bbd2db4b2247b90d83deec5e8befbee536 [diff] | |
| parent | 953981db624c23b0aab3906a06e3910622a8a01f [diff] |
resolved conflicts for 953981db to stage-aosp-master Change-Id: Ic1003a594ac5e5e91b124f249a569fb81123e973