| commit | 6922f89aefa41227538012c6aee4e31eeac96a8c | [log] [tgz] |
|---|---|---|
| author | Ying Wang <wangying@google.com> | Mon May 12 23:30:42 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon May 12 23:30:42 2014 +0000 |
| tree | db34eca2da5ec1662b262862fc44c323209fcb14 | |
| parent | e275abf73ae03e37dfe2d90904b763ce2fa0d30b [diff] | |
| parent | beefce58dc9e1987143391634c09249d478bd598 [diff] |
am beefce58: am 8d4562a1: resolved conflicts for merge of 0a694f4c to master * commit 'beefce58dc9e1987143391634c09249d478bd598':