| commit | d45cc6b4e9b882b593f46af6cbb7bcd8b64af4a4 | [log] [tgz] |
|---|---|---|
| author | Tim Kilbourn <tkilbourn@google.com> | Tue May 13 15:19:12 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue May 13 15:19:12 2014 +0000 |
| tree | d593cb34b8e2adbe2c14ae99554c7d5824f3cbed | |
| parent | 49c21b82b4e487112d21b07d84d08414ef28040f [diff] | |
| parent | 933c03dfcf8ed170e9f2c40439dc20cc6536cfe2 [diff] |
am 933c03df: am 957fa659: resolved conflicts for merge of 9eecf3fc to master * commit '933c03dfcf8ed170e9f2c40439dc20cc6536cfe2':