commit | d0f3ba6003b1c9430349043d7f979d600967dd2f | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Thu Aug 21 17:30:40 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 21 17:30:40 2014 +0000 |
tree | 6931963b83b155148dd0bacd7d806665a62b36d8 | |
parent | 3656cc20c8a569964d0450ce3207b651c007c35c [diff] | |
parent | 0e54db6b8ac292b4193a924176a939d4326e803b [diff] |
am 0e54db6b: am 8b5d62a4: am f4af48ae: am 9dde6a6d: am ddeaf256: Merge commit \'ba89934bdae7f4256c94a0a24992903a114e764f\' into HEAD * commit '0e54db6b8ac292b4193a924176a939d4326e803b':