| commit | b98e85a13a5928e1015529d1d341d7088c520a26 | [log] [tgz] |
|---|---|---|
| author | Yorke Lee <yorkelee@google.com> | Tue May 13 23:54:21 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue May 13 23:54:21 2014 +0000 |
| tree | 967f2714b7c695a2c8690d8099672ae2c639bbb8 | |
| parent | faf54f9b5431d24d8844c62c52052f08c8db6ea7 [diff] | |
| parent | b8fb783287276c969dabde8e8e09cdd2b92d27fc [diff] |
am b8fb7832: (-s ours) resolved conflicts for merge of 86e21f73 to master-nova * commit 'b8fb783287276c969dabde8e8e09cdd2b92d27fc':