| commit | 4ae03b99750750c8467d808819322ddf402cd0d7 | [log] [tgz] |
|---|---|---|
| author | Jesse Hall <jessehall@google.com> | Thu Jul 11 17:07:26 2013 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Jul 11 17:07:27 2013 +0000 |
| tree | 0c9289a9cb3762c7570a883b774530d4d971e0f7 | |
| parent | c33f9a76b5dff1a9b4e4d0c76459c0d5b36a0d74 [diff] | |
| parent | 94cdba97ce1de140623d84c14fb15f12f7da89dd [diff] |
Merge "resolved conflicts for merge of 5477d0e4 to master"