| commit | 4acabe0fd8778aad079ed4b3a9bbe011db12ece3 | [log] [tgz] |
|---|---|---|
| author | Ying Wang <wangying@google.com> | Wed Apr 08 16:21:58 2015 -0700 |
| committer | Ying Wang <wangying@google.com> | Wed Apr 08 16:21:58 2015 -0700 |
| tree | b6972f5ef2ca31d76e84142b4f8058ac1ceed6a2 | |
| parent | bf2474fba4dc446b4b580f4122d172e011c24ba1 [diff] | |
| parent | f5b9830bc94d1416001fda508c7ecf16db5db27c [diff] |
resolved conflicts for merge of f5b9830b to stage-aosp-master Change-Id: I2eaab6ce59ee2dd89b89259f409bfff6180c89d3