| commit | f2ee0f22f03b21ab4d2620c3f71ab6ca50d8fa12 | [log] [tgz] |
|---|---|---|
| author | Neil Fuller <nfuller@google.com> | Tue Sep 01 10:06:40 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Sep 01 10:06:40 2015 +0000 |
| tree | 6770798b4a4f67f62a5450ac91c94dc8f51a197a | |
| parent | 0db2e11aed876d5f51c7227750827e1ce43b09f5 [diff] | |
| parent | 25c0c2eeefc4c78254e566e8f3f115bd11682588 [diff] |
am 25c0c2ee: am 5f8b2eed: am 2784ad7c: am d0ba0110: am 9603baee: am 5bca0d94: am c8e1b9c1: resolved conflicts for merge of bfeba0c4 to jb-mr2-dev-plus-aosp * commit '25c0c2eeefc4c78254e566e8f3f115bd11682588':