| commit | 406be84ed3cbeac84f7c3de77090f3606e48d593 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Thu Jun 05 18:40:49 2014 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Jun 05 18:40:50 2014 +0000 |
| tree | 111a548357f166e9555f68052bcd379095bd6262 | |
| parent | 561d5aa8ac163414456c7449d95d535374a2e39f [diff] | |
| parent | 2432912b356dfafd72f8be7b45286a9bc979029e [diff] |
Merge "resolved conflicts for merge of f8272896 to master"