| commit | 27ddc3e299baca7d8987fc92933683d7d3268ec6 | [log] [tgz] |
|---|---|---|
| author | Ficus Kirkpatrick <ficus@android.com> | Mon Dec 08 10:21:14 2014 -0800 |
| committer | Ficus Kirkpatrick <ficus@android.com> | Mon Dec 08 10:21:14 2014 -0800 |
| tree | 1f4a33c24f608d79781de54e5d1ff5f3072fa261 | |
| parent | a974734df1f6bc580a78bb43c41216ba54868415 [diff] | |
| parent | c9ef93a4cdc75d04667a3e5150d9278d2c7b41d8 [diff] |
resolved conflicts for merge of c9ef93a4 to lmp-mr1-dev-plus-aosp Change-Id: I1007b20d92fcbcfe0889199ceb751a4f4b1a3fa0