| commit | 6cbb42186e990c401da1e1dbc465fd58fde158a1 | [log] [tgz] |
|---|---|---|
| author | Jinsuk Kim <jinsukkim@google.com> | Wed Oct 15 07:30:46 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 15 07:30:46 2014 +0000 |
| tree | be73c928fc9a21afa2e8e96e8edfc216f8d29f1f | |
| parent | 7b2993c565f93e09ebc76d2007bd0ba5ba3d5429 [diff] | |
| parent | 05fefb69758f5cf260cdf4ae374a3a4c519cf437 [diff] |
am 05fefb69: am 18279da7: am f55cdab4: resolved conflicts for merge of f9a924ab to lmp-mr1-dev * commit '05fefb69758f5cf260cdf4ae374a3a4c519cf437': DO NOT MERGE CEC: Queue actions for starting later when not ready