| commit | 2616c9016e550ddec9545bbac8cca175f83256b0 | [log] [tgz] |
|---|---|---|
| author | Bill Yi <byi@google.com> | Wed Apr 30 12:50:20 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Apr 30 12:50:20 2014 +0000 |
| tree | d35992087cac17aa02c1f2dc59c6e4fbd20053bc | |
| parent | 005ff6021a3126e8b5f7bc7eadd7f080f78fa78b [diff] | |
| parent | 0512ec33ff825470297f8c633fc6a5ce35fde771 [diff] |
am 0512ec33: am 08e9b2a4: Merge commit \'f404dc42d6677a1aee88d1ce996a7e8e4afe55bb\' into HEAD * commit '0512ec33ff825470297f8c633fc6a5ce35fde771':