| commit | b4dbb88c5dc41760f6c7f3a511ecda4526bb34b2 | [log] [tgz] |
|---|---|---|
| author | Yorke Lee <yorkelee@google.com> | Tue May 13 23:54:23 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue May 13 23:54:23 2014 +0000 |
| tree | 967f2714b7c695a2c8690d8099672ae2c639bbb8 | |
| parent | 8fff3a1db1229dc4dc01f4738f71d18e27505b19 [diff] | |
| parent | d1bcd5c86cb3fc9eb263d5daed663e0afc75f3f9 [diff] |
am d1bcd5c8: resolved conflicts for merge of e00c9fe1 to master-nova * commit 'd1bcd5c86cb3fc9eb263d5daed663e0afc75f3f9':